From 2a18f2150d94600538d867257a76cb0feb0d615c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 29 Mar 2020 15:26:56 -0400 Subject: [PATCH] window: Make set_focus equal to grab_focus Make gtk_window_set_focus call gtk_widget_grab_focus internally. This means that set_focus can now end up putting the focus on a child of the passed-in widget, and makes the focus-widget property work for setting initial focus to (the child of) an entry in a ui file. --- gtk/gtkwindow.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 745946c8b2..7e211aaa0f 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -5667,7 +5667,10 @@ gtk_window_set_focus (GtkWindow *window, { g_return_if_fail (GTK_IS_WINDOW (window)); - gtk_root_set_focus (GTK_ROOT (window), focus); + if (focus) + gtk_widget_grab_focus (focus); + else + gtk_window_root_set_focus (GTK_ROOT (window), NULL); } static void -- 2.30.2